From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 3 Feb 2011 22:51:38 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4685^2~71
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=098ff10977b083c4cce8b2e319ca6d70bb1f3493;p=emacs.git

Merge from mainline.
---

098ff10977b083c4cce8b2e319ca6d70bb1f3493